resolving conflict with kevin's code