Also refactored this one to match the rest