edited naming and finalised the module