Tried to improve Sol 06