Updated with more gene options