updated solutions for consistency