updated code more