Enhance the code here