Changed code to updated selfpage