Fixed Josh’s mistakes