changed adjustborder to be a macro