removed unnecessary check
added eolimp 2165
added eolimp 2166
added eolimp 2164