new numbers after merging recent changes from alex's branch