Changes done according to wiki