Some Plannar mapping

More updates