Yep, you're right. Moved the attributes accordingly.