second commit - fixed previous issues