Refactoring + new instructions