updated with module addition