Replace code commented out for debugging