3.0 lotsa changes, modifications and additions