Added all Ver_048 changes