removed double code