update and add more stuff