Version 3.0

formatting changes