fixed manifest and duplicated functions