Added clockspin and fixed bottles