Solution update

Ready to compilation