Edited my classes