modified Current Work - completed