Added support for cos/sin buttons