updated code

Work...