Try new implementation