Refactored to be consistant with documentation