Cleaned up A8