added commented out code to check and implement