Restructured calls slightly, fixed position error