Update to pass specs