Changed jimmi and minor changes