fixed and finished