changed some stuff:
adding more stuff