added domains,not yet finished though