Matching kima.sh with new structure changes