Added check_width