Accidently forgot to do a renaming and delete some methods