Uncommented various functionality