cleaned up work-in-progress