added changes to almost everything