Upgrading world drawing, no more cheaty math