Small improvement and help added