make the attributes earlier
3 files changed