LMW-24 Changes for Beta 4