Added local changes and module