1. Added better marker code.