Issue-21 solutions update