Improve polygon map function
Update tape