Most of issues solved