updated some code
updated code