Giant petbuddy overhaul Part I