Updates #15 by using a supplied integer as an index lookup