Working on XS1 push, optimizing around the place