Got rid of semaphore