Updated for Beta 3/4 and tweaks