Made a few changes, double parens need more work