Added some work for kekc and egr