timing issues resolved somehow