Changed paths and URL for proper