Some More Changes ver1