Clockwork, Revised and Expanded