updating silvio's branch