Updated for Version 1.0 RC1