some adjusments