add non-flash support