I’ve made a couple more modifications and I think I got it