flash restructure (slight)