US493 - Reinstate referer - refactor