Code fixed for modularity