Modified for surpriseBS design