Moved position calculation to account