Refactoring + new squares with arrows