ok changed a few more things