Merge testing to fix access issues (500 error)