Tested, confirmed working now