Improved the genetic section, still need some work done