added some more stuff and changed some parameter names