convert done - needs testing