need bettert workflow...