major fix done