Changed according to comments