tweaks to keep Andre happy