Making adjustments
Bug fix