added a few more stuff