Enhacement issue#1