Added solutions for initial and final states