Updated simulateAL from master