Feature/re work

Re-work around setReadyStatus().