Andre's changes