Added more friendliness