Revert "Revert "Changed assignment""

This reverts commit 7a6c0dec7142372461d7b82aba41b342ce4c7dfb.