Main is better now

Kevin's changes part 3