Added lots of perceptual stuff