new version

including miko, marina and aviv changes.