ASA_1660 - Version 4

Work in progress