Fixed Shark - Kalle merge