CSS and waiver calculation changes