Trying solve some issues
Commited all of changes