some changes for deployment on the real internet :P