5.0 for real

merge changes