Improve choose action