merge modifications from mop into chart app