Some key modifications.