Added 2 buttons support and preorder