Basic changes made.