Modified main to account for new modules