Adding Tim's updates and bumped version