Margarita's Pull request for module