changed props, updated funcs