Added marked elements
 Refactor