Updated code to allow initial specs to pass