added a couple more things to make everything work the way it's supposed to :D