reformatted commancenter and eventCommandMap