Kal 6 may

update after merging last pull request