Refactored to new syntax