improvements for BUY WIP