Major revision to stage2. Implemented Aeff service in the right way now.