refactored markers