Updates to prevent preload flashing.
Fixed conflict between remote & local.