included andre's changes