Updated - Couple of small errors fixed