Removed converter; Simplifyed