now working with the latest edition of core