work in progress - status fix