prefinal commit - Added compatibility from tablets