Incorporated some translator logic