Working version but times aren't right