added data override keywords, works more or less