changed markers and other stuff