updated for popup