Updated changes to Clock30