modified for new dynamic styling