updated armature & framework