updated for ForwardJS