Made changes in accordance to Coma