Updated Task solutions