* updated solutions