Uncommented more code for bug investigation