more unity support; moved old code to old code area