second commit - version 1.5