I forgot to amke this PR earlier

Some other changes