Taking what I learned from the first version and redoing it.