Done few changes