Adding more improvements