Update

Last update before movionf from dev2 to live
Last minute Back-up to be sure!