moving calls around due to timing issue