updated to work with the new CSS