This mechanic NEEDS to change.

Published --