Adhering to the new spec