updated version, very messy & progress on pause