Added omit_border