Work on language controls