reworking to not be world clock