Use non-blocking action logic for first point (#61)

Use non-blocking action logic for first point (#61) #353