Implemented #11 on both Samsung & Movial