Revert "Revert "Changed 2 things""

This reverts commit 58897d04c14f3537b28231dd411b036a1142b07e.