updating for better usage with current avon setup