Refactored for Pixate Freestyle