removed redundant endpoint_ from variable names...