fixes flashes being inconsistent
merges conflict with TODO