Modified to work with pull request to pointshop by BlackVoid