Clean up AA interface and added shapes.