Updates

Latest changes and updates to Zakra