Kal 06 feb

update after initial implementation