Underlines working and added comments