this is taking out extra code