Changed a few things to make it work properly