edits to shared funcs