Added new mechanism and pretty graphs