Added pauses and cleanup