Added latest changes from the old server. Hope all works OOB!