Safer code. Re-add original code commented out for future use.