compute, lagt till up/ner logik
merge resolved