Merged and fixed Amnet's features