walter/tilal updates