added some things. it will work soon !