Cleaned up. Next: own marker.