Edited solver in dimensional form