More Updates to Default Code