Further development on work-in-progress