commit tek puna. 17/09