General Psychology, Revised