commented and finished