added control mapping