fixes flash
fixes schema