add check and adjust