areshinakya fix and my updates