@nightshining added functionality