added int y.
added souble r.