back to original functionality, w new method