Changes made to coincide with CSS ammendments