adapter added ( have bugs!!)