Commented all help methods
Merge conflicts