Second commit - fixed errors