new sparks added, code cleanup