removed some sleep; updated for user based variables