Commented new and legacy code