made some changes
added some stuf