changed schema - Manli