All changes + Small Fix