Did some changes with code.