Mostly completed; needs improvement