Added stuff for popup