Version 2.0: fixed things up