Latest amends from Compass