Adds more improvements