Altered logic slightly on entry array creation; eliminated one redundancy.