Bug fixing and New module