DEF finished (maybe) please check to ensure it's correct