Updated to reflected changes
Removed old comment