updated to include clock or not