Fixed and merged kali work