Important changes from Assistant