second commit - fixed