Refactoring + started Xinstruction