changed 1 to A
changed trash functions