Changed order of scripts