second commit: added functionality