refactored, murkup and email splited up