Changed SS and removed delays