Modifications done in solving some issues