Clean up and added a 2500MS delay to fix stutter