Spec fixed and modifications