reordered my work and edited my test