Fixed Niklas version and added TODO for improvement