diff --git a/php/classes/AmdaAction.php b/php/classes/AmdaAction.php
index efc3ffc..7a1bd47 100644
--- a/php/classes/AmdaAction.php
+++ b/php/classes/AmdaAction.php
@@ -222,8 +222,8 @@ class AmdaAction {
                                 $info .= "Time Range: ".$child->getAttribute('dataStart')."-".$child->getAttribute('dataStop')."<br/>";                                
                             }  
                             
-                            if ($child->getAttribute('restricted') > 1) {
-                                $restricted  = $child->getAttribute('restricted');
+                            if ($child->getAttribute('restriction') > 1) {
+                                $restricted  = $child->getAttribute('restriction');
                                 $info .= "<b>Time Restriction</b>: -$restricted days<br/>";
                             }
                        
@@ -243,7 +243,7 @@ class AmdaAction {
                                     $globalStop = $child->parentNode->getAttribute('dataStop');  
                                 }
 
-                                if ($child->parentNode->getAttribute('restricted') > 1 )
+                                if ($child->parentNode->getAttribute('restriction') > 1 )
                                 {
                                     $timeRestriction = true;
                                      
@@ -271,7 +271,7 @@ class AmdaAction {
                                     $globalStop = $child->parentNode->parentNode->getAttribute('dataStop');  
                                 } 
 
-                                if ($child->parentNode->parentNode->getAttribute('restricted') > 1)
+                                if ($child->parentNode->parentNode->getAttribute('restriction') > 1)
                                 {
                                     $timeRestriction = true;
                                      
@@ -310,23 +310,7 @@ class AmdaAction {
                              {                              
                                  $needsArgs = true;
                              }
-                            
-                            if ($id == 'mex_n_sw' || $id == 'mex_v_sw') 
-                             {
-                                  $not_yet = true;
-                                 
-                             }
-
-                            //TODO proper conditions
-                            if (substr($id,0,3) == 'ros') 
-                             {
-                                if ( !(strpos($id,'_r_') || strpos($id,'_xyz_') || strpos($id,'_cg_')
-                                     || strpos($id,'_sc_') || strpos($id,'_aux_') || strpos($id,'_sw_') 
-                                     || strpos($id,'_tao_') )) 
-                                {                                 
-                                   $not_yet = true;
-                                } 
-                             }
+                           
 
                             $objectMgr = new AliasMgr();
                             $alias = $objectMgr->getAlias($id);
@@ -341,12 +325,12 @@ class AmdaAction {
                         {
                             if ($child->tagName == 'mission') 
                             {
-                                $disable = ($child->getAttribute('available') != "1");
+                                $disable = $child->hasAttribute('restriction');
                                 $rank = $child->getAttribute('rank');
                             }
                             else
                             {
-                                $disable = $child->getAttribute('restricted');
+                                $disable = $child->hasAttribute('restriction');
                             }
                             
                             if ($disable)
@@ -390,8 +374,8 @@ class AmdaAction {
                         }
 
                         $isDeletable = $child->hasAttribute('isDeletable');
-			$specialNode = true;
-			$isParameter = false; 
+			   $specialNode = true;
+			   $isParameter = false; 
                         $isSpectra = false; 
                    
                         switch ($id)  
--
libgit2 0.21.2