Re-does will's classe tags