Updated with new syntax