Updated mechanism
Commented out irrelevant methods