rewrote with import/execute blocks