added a few more things