Improve mark complete