Working version after status refactor