updated to match other modules