add comment
change some stuf