major changes to support comming architecture