removing cristian's code