some changes worked from 4amto5pm