Changed according to assignment