basic modification to make it work