fixed and finished!