base Synchronization

Updated Context to keep in line with changes made to base.