Updated to reflect newer A3M fork