Making actual changes, up to date now with my version