Imported from https://github.com/gmkim90/AAS_enhancement