Minor changes ... still need check and changes