solutions updated, not tested