-removed double code