added calculated attributes