removed duplicate defination of wrapper
minor changes