updated onpop forward