Uncommented functional code

Some code was commented out accidently. This has been resolved.