Revert "Revert "Updated shitty""

This reverts commit 5d4c924b6c9cccd64ed1922142b6c6bb3e941727.