a few more changes from Marco