Some more updates

More updates