Changes to fit spec behavior