follow spec better