adding more improvements