update for schema - still buggy