Added all Ver_047 changes