Some Code Changes + Gnar optimiced