messed with some more editing