Updated some coding