some changes justin helped me with