rename package
check for endpoint variable
OPTIONS fix