changes to support alpha architecture
changes to support alpha architecture