Enhachement & Bug Fix