Simplified code.
Version 2.3.0