Removed spam and reorganized marker, still broken