merged bodycount branch