FIxed : updated to reflect changes to core implementation