moved hack to a command class