updated with new CSS selectores