Use non-blocking action logic for first point

Use non-blocking action logic for first point #351