Updating Miranda's changes