Updated functionality and email scheduler