Modifications + added mail