Undid some stupid changes