changes to support alpha architecture