addons/improve code