Added more stuff for Kamniari