cleaned up A