Removed WOM dependency (some tidying required)