Changed solver to be sent as event