working on code
updated code