add time constraint and modify client