Reenabled commented code