more wrappers
included Arnouds suggestions