more andreas changes