Better movement selection