removed all previously code