added choose option (but buggy!) need to fix..