more changes...:)
more more more
final changes GB