Updated loading and passed more flags around