security done
manualy fixed conflicts with slk commit