improved wrapper
highlight code