un-Comment some parts of code