Added convert action
Changed conversion order and removed trailing comma