changing back to old partial application for the moment