new version2

last changes, including aviv marina and miko .