ADDED some stuff... too much to type everything in here
deleted one line