Further changes to bay position calculator