WIP

 - patched up issue with extra calls to update_limits