Updated for improved performance/visuals