Updated terminology and updated functions