added more attributes, redefined some of them