simplify process and fix tast case