Added SNAFU features