Changes from Richards version