HUGE remake of my first edit