Modified to work with pull request to pointshop by BlackVoid

Modified to work with my pull request to pointshop.