Updating response codes to give more correct responses