Added more specs
Fixed CS