some extra changes since last version