Update to shorter solution