renabled optimization