Tackled some simple XXX's