date now ommittable
refactored