added converter and did some other stuff