Final changes on module