Interm checking of status refactor