moved attributes into attributes file