optimization re-enabled