Made changes according to Beta 4.