Some updates to make it better