Fixed code, moved converter