changed the order of stuff