move with_scope to the correct place