Changed according with statements