added scolling when done!!!!!