Some more changes to the underline