Adding limit case verification and composition