More updates!! Not layout based this time.