Merged the two moduls