updated due to konrad comments