Square values now dynamically added