Final changes + email script