actually using choice and fixing for index bound issues