Modified for next version 2.0.1