Opt. issues fixed.