Major reworking of ready.