Revert "Revert "Changed assignment""

This reverts commit 956da9eb7f8190e0492299a835557673e10bef80.
Revert "Changed assignment"

This reverts commit 9842e22763a81fab0de82f0608f00c28e7a456ba.