diff --git a/submodules/fbss_rules/fbss_rules.rules.inc b/submodules/fbss_rules/fbss_rules.rules.inc
index 2d3fb4a..b10c2dc 100644
--- a/submodules/fbss_rules/fbss_rules.rules.inc
+++ b/submodules/fbss_rules/fbss_rules.rules.inc
@@ -58,21 +58,29 @@ function fbss_rules_rules_condition_info() {
           'label' => t('The status'),
         ),
       ),
-      'module' => 'Statuses',
+      'group' => t('Statuses'),
     ),
     'fbss_rules_can_post' => array(
       'label' => t('User has permission to send a status message'),
       'arguments' => array(
         'recipient' => array(
-          'type' => 'number',
+          'type' => 'integer',
           'label' => t('The ID of the object to which the status will be posted.'),
         ),
+        'recipient_types' => array(
+          'type' => 'list<text>',
+          'label' => t('Recipient type'),
+          'restriction' => 'input',
+          'options list' => 'fbss_can_post_reciptent_types',
+          'optional' => TRUE,
+          'description' =>  t('The types of recipients allowed for this condition to be true.'),
+        ),
         'sender' => array(
           'type' => 'user',
           'label' => t('Sender'),
         ),
       ),
-      'module' => 'Statuses',
+      'group' => 'Statuses',
     ),
     'fbss_rules_rules_condition_can_edit' => array(
       'label' => t('User has permission to edit a status'),
@@ -82,7 +90,7 @@ function fbss_rules_rules_condition_info() {
           'label' => t('The status'),
         ),
       ),
-      'module' => 'Statuses',
+      'group' => 'Statuses',
     ),
     'fbss_rules_rules_condition_can_delete' => array(
       'label' => t('User has permission to delete a status'),
@@ -92,7 +100,7 @@ function fbss_rules_rules_condition_info() {
           'label' => t('The status'),
         ),
       ),
-      'module' => 'Statuses',
+      'group' => 'Statuses',
     ),
     'fbss_rules_rules_condition_is_type' => array(
       'label' => t('Status recipient is a certain type'),
@@ -101,8 +109,16 @@ function fbss_rules_rules_condition_info() {
           'type' => 'statuses',
           'label' => t('The status'),
         ),
+        'recipient_types' => array(
+          'type' => 'list<text>',
+          'label' => t('Recipient type'),
+          'restriction' => 'input',
+          'options list' => 'fbss_reciptent_types',
+          'optional' => TRUE,
+          'description' =>  t('The types of recipients allowed for this condition to be true.'),
+        ),
       ),
-      'module' => 'Statuses',
+      'group' => 'Statuses',
     ),
   );
 }
@@ -115,9 +131,29 @@ function fbss_rules_is_self($status) {
 }
 
 /**
+ * Generates the options for the fbss_rules_rules_condition_is_type condition.
+ */
+function  fbss_reciptent_types(){
+  $contexts = module_invoke_all('statuses_context_info');
+  $options = array();
+  foreach ($contexts as $key => $context) {
+    $options[$key] = $context['title'];
+  }
+  return  $options;
+}
+
+/**
+ *
+ */
+function fbss_can_post_reciptent_types() {
+  $options = array('auto' => t('Automatically determined'));
+  return array_merge($options, fbss_reciptent_types());
+}
+
+/**
  * Builds the form for the fbss_rules_can_post condition.
  */
-function fbss_rules_can_post_form($settings, &$form) {
+/*function fbss_rules_can_post_form($settings, &$form) {
   $settings += array('type' => 'user');
   $contexts = module_invoke_all('statuses_context_info');
   $options = array('auto' => t('Automatically determined'));
@@ -131,12 +167,13 @@ function fbss_rules_can_post_form($settings, &$form) {
     '#description' => t('The type of entity onto whose stream the status update will be posted.'),
     '#options' => $options,
   );
-}
+}*/
 
 /**
  * Checks if the user is allowed to post a status.
  */
-function fbss_rules_can_post($recipient, $sender, $settings) {
+function fbss_rules_can_post($recipient, $recipient_types, $sender) {
   if ($settings['type'] == 'auto') {
     $context = statuses_determine_context();
     $settings['type'] = $context['handler']->type();
@@ -147,7 +184,7 @@ function fbss_rules_can_post($recipient, $sender, $settings) {
 /**
  * Builds the form for the fbss_rules_rules_condition_is_type condition.
  */
-function fbss_rules_rules_condition_is_type_form($settings, &$form) {
+/*function fbss_rules_rules_condition_is_type_form($settings, &$form) {
   $settings += array('types' => array());
   $contexts = module_invoke_all('statuses_context_info');
   $options = array();
@@ -161,16 +198,16 @@ function fbss_rules_rules_condition_is_type_form($settings, &$form) {
     '#description' => t('The types of recipients allowed for this condition to be true.'),
     '#options' => $options,
   );
-}
+}*/
 
 /**
  * Checks if the status recipient is one of a specified type.
  */
-function fbss_rules_rules_condition_is_type($status, $settings) {
-  if (empty($settings['types'])) {
+function fbss_rules_rules_condition_is_type($status, $recipient_types) {
+  if (empty($recipient_types)) {
     return FALSE;
   }
-  return !empty($settings['types'][$status->type]);
+  return !empty($recipient_types[$status->type]);
 }
 
 /**