Some changes, looking to other way for this module