updated some more codes