JK: Initial modifications.