diff --git a/workflow_submit.info b/workflow_submit.info
old mode 100644
new mode 100755
index 084fb66..e1d295a
--- a/workflow_submit.info
+++ b/workflow_submit.info
@@ -1,4 +1,4 @@
 name = Workflow Submit
 description = Tweaking workflow behavior to change radio button options to submit-style buttons.
-core = 6.x
+core = 7.x
 dependencies[] = workflow
diff --git a/workflow_submit.module b/workflow_submit.module
old mode 100644
new mode 100755
index f666009..c07cc4b
--- a/workflow_submit.module
+++ b/workflow_submit.module
@@ -10,27 +10,27 @@
 /**
  * Implementation of hook_form_alter().
  */
-function workflow_submit_form_alter(&$form, $form_state, $form_id) {
-  if ($form['#id'] == 'node-form' && isset($form['workflow'])) {
+function workflow_submit_form_alter(&$form, &$form_state, $form_id) {
+  if (strpos($form['#id'],'node-form') && isset($form['workflow'])) {
     // Create new submit buttons for each available workflow state
     $button_base = array(
       '#type' => 'submit',
       '#access' => TRUE,
-      '#weight' => $form['buttons']['submit']['#weight'],
+      '#weight' => $form['actions']['submit']['#weight'],
       '#submit' => array_merge(
-        array('workflow_submit_node_submit'),
-        $form['buttons']['submit']['#submit']
+        array('workflow_submit_node_submit_callback'),
+        $form['actions']['submit']['#submit']
       ),
     );
     $workflow_name = check_plain($form['#wf']->name);
     if (!empty($form['workflow'][$workflow_name])) {
       foreach ($form['workflow'][$workflow_name]['#options'] as $sid => $state) {
-        $form['buttons']['workflow_'. $sid] = $button_base;
-        $form['buttons']['workflow_'. $sid]['#value'] = $state;
+        $form['actions']['workflow_'. $sid] = $button_base;
+        $form['actions']['workflow_'. $sid]['#value'] = $state;
       }
     }
     // Disable original submit button
-    unset($form['buttons']['submit']);
+    unset($form['actions']['submit']);
 
     // Disable workflow form
     // This is set automatically depending upon which button was selected
@@ -43,7 +43,7 @@ function workflow_submit_form_alter(&$form, $form_state, $form_id) {
  *
  * Invoked in workflow_submit_form_alter().
  */
-function workflow_submit_node_submit($form, &$form_state) {
+function workflow_submit_node_submit_callback($form, &$form_state) {
   // Could there ever be more than one parent for a button?
   // Button could be placed multiple times...  we should be ok.
   $button_id = $form_state['clicked_button']['#parents'][0];
@@ -53,4 +53,4 @@ function workflow_submit_node_submit($form, &$form_state) {
   if (is_numeric($sid)) {
     $form_state['values']['workflow'] = $sid;
   }
-}
+}
\ No newline at end of file