Undefineds and round brackets added in some places