Added in inverts to reflect klyde's changes