Second commit - fixed some troubles
second