Changed to lazy translation and updated