finished and commented change return