Some adjustments
Added FunnyOrDie
Added FunnyOrDie