added some more updates, still is not configurable yet.