add check for on