closed #122, flares added