Changing module, fixing errors