added some
added some deleted