Another small fix for BF + some shawn moods

Shawn moods for Shawn_1