fixed to reduce message and time