Revised to fix formatting issues