Removed BlockStep for simplicity