Some updates to scope mode