Modified the controller logic to have # in front