Updated with correct names and notations