Gustavo design overhaul