updated for forwardjs