updated to version 2.1