Some things for 3rd task but with some issues