Changed a few parts to suit free slots