Merge solution
Changes to fix for kia, also images added
Routes fixed