Version 2.1

More updates