working version without test support.