Some changes to allow for modularity