improvements to add check as well