Adding Miranda's changes