TO-DO: implement enhancement logic