Fixed up calling and temp movement