added in border stuff