Minor change with Class