Changed the framing to account for bit masks