cleaned up moving to flash