changed a little bit more stuff