Version 1.0.6, Use Marked instead of Namp