Jeremy | Updated van methods - using full and broken methods