Add proper solution for projects 18 and 67