More work done on experimental branch