Before merge for popup