Marionette optimizing BB code!
Added controller