Updates updates and more updates

More updates please.