Added new solver code