Changed where preload is done