preliminary work on making it somehow correct on handsets