updated for final submission, not all working