Moved upgrade handling to chest side