Added graphic optimization