add formate works more well and alos few vallidations.