reorganize order of operations, tick filling