added a couple more things