Added some changes for @BigXplosion to look at