Update for user friendliness