Updates after modifying my fork of the AG plugin