first commit - fixed