merging jin's changes for marks