second commit

please review this