Made code match original