Final edit in class