Added solution functionality