Mandrill changes