Some cice improvements (still not working tho)