Bug
Commented out code removed