Modified while testing

added some stuff while live testing.