add the catch module
merge the code