some changes to make this right