Changes from pandastrike.com