Added changes from Andre