#94 enhancement current manager