updates on #5