Improve marking