felix commit new 11/24