Changed imports and cleaned old email address