latest changes from Ampersand