Fixed up a bit of stuff with ASL
Merge
Merged