More updates to get thing right