I think this should be changed into a toggle.