Kal 13 june

re-sync after integrating changes