Changes for crypt sim