finished, but room for improvement