Futher optimization