last changeset, few adjusments