Fix bugs but data base is still dispolsing