Some changes: scopes, submits, tests