conversion stuff added