Fix name and added exigences