Rensselaer Center for Open Source Software

4 files changed, 14 lines added, 138 lines removed
kmcnellis
Commit • Homework Server • 8 hours ago
Dimitar Dimitrov
4 files changed, 1 line added, 1 line removed
Commit • Peirce-Logic • 11 hours ago
2 files changed, 1 line added, 1 line removed
chadunn13
Commit • AskPI • 11 hours ago
12 files changed, 195 lines added, 107 lines removed
chadunn13
Commit • AskPI • 11 hours ago
2 files changed, 17 lines added, 2 lines removed

tweaked some stuff

chadunn13
Commit • AskPI • 11 hours ago
2 files changed, 30 lines added, 3 lines removed

tweaked some stuff

chadunn13
Commit • AskPI • 11 hours ago
2 files changed, 22 lines added, 22 lines removed

tweaked some stuff

chadunn13
Commit • AskPI • 11 hours ago
David Kim
2 files changed, 7 lines added, 0 lines removed
Commit • Peirce-Logic • 11 hours ago
Robert Rouhani

As of about a week ago SharpNav has been available on NuGet (C# package manager) for users to try out before a 1.0 release.

I've already gotten 3 useful issues opened on my GitHub repository by 2 different people:

I have a milestone laid out for a 1.0 release, which will probably happen at the end of the semester once we have enough feedback from users as well as from building up an editor.

I will also probably pull the editor and the examples out into their own repositories to keep things cleaner. At the moment, both will break when trying to compile for a platform other than OpenTK or Standalone. This will break Observatory's ability to make sure I'm still doing work, but there should be plenty of work being done on the library alonside the editor and example project.

Post • SharpNav • 11 hours ago
David Kim

The library that is going to be used for touch/gesture has been decided.We have decided to use hammer.js to implement gestures and recognize inputs from touch devices.As of right now, our top priority is to finalize complete touch compatibility with the webapp.Later on we may add gestures to remove the dependence on the context menu on small screens.

Post • Peirce-Logic • 13 hours ago
22 files changed, 1759 lines added, 1658 lines removed

Split opcodes into two separate namespaces. dr_ir_opcodes.h now just includes one of two new files, dr_ir_opcodes_{x86,arm}.h. Moves opcode.h to x86/ and adds arm/opcode.h. Adjusts include_directories.

Marks part of mangle.c as x86-specific, enough to build drdecode for ARM: but more refactoring is needed of other x86 files to build full DR on ARM.

git-svn-id: http://dynamorio.googlecode.com/svn/trunk@2886 49cc7528-f6fd-11dd-9d1a-b59b2e1864b6

derek.bruening <derek.bruening@49cc7528-f6fd-11dd-9d1a-b59b2e...
Commit • DynamoRIO Projects • 14 hours ago
2 files changed, 2 lines added, 2 lines removed

git-svn-id: http://dynamorio.googlecode.com/svn/trunk@2885 49cc7528-f6fd-11dd-9d1a-b59b2e1864b6

derek.bruening <derek.bruening@49cc7528-f6fd-11dd-9d1a-b59b2e...
Commit • DynamoRIO Projects • 14 hours ago
12 files changed, 2015 lines added, 1790 lines removed

Moved disassemble.c to disassemble_shared.c and added core/arch/{x86,arm}/disassemble.c, containing 5 arch-specific routines.

git-svn-id: http://dynamorio.googlecode.com/svn/trunk@2884 49cc7528-f6fd-11dd-9d1a-b59b2e1864b6

derek.bruening <derek.bruening@49cc7528-f6fd-11dd-9d1a-b59b2e...
Commit • DynamoRIO Projects • 14 hours ago
12 files changed, 3988 lines added, 3879 lines removed

Move the bulk of instr_create.h into core/arch/{x86,arm}/instr_create.h. Some is shared, so I also have core/arch/instr_create_shared.h.

git-svn-id: http://dynamorio.googlecode.com/svn/trunk@2883 49cc7528-f6fd-11dd-9d1a-b59b2e1864b6

derek.bruening <derek.bruening@49cc7528-f6fd-11dd-9d1a-b59b2e...
Commit • DynamoRIO Projects • 14 hours ago
10 files changed, 1766 lines added, 1302 lines removed

Move arch-specific code into core/arch/{x86,arm}/instr.c. Adds an initial impl for some of the ARM routines but mostly they are stubs.

git-svn-id: http://dynamorio.googlecode.com/svn/trunk@2882 49cc7528-f6fd-11dd-9d1a-b59b2e1864b6

derek.bruening <derek.bruening@49cc7528-f6fd-11dd-9d1a-b59b2e...
Commit • DynamoRIO Projects • 14 hours ago
10 files changed, 117 lines added, 22 lines removed

Move arch-specific code into core/arch/{x86,arm}/opnd.c.

git-svn-id: http://dynamorio.googlecode.com/svn/trunk@2881 49cc7528-f6fd-11dd-9d1a-b59b2e1864b6

derek.bruening <derek.bruening@49cc7528-f6fd-11dd-9d1a-b59b2e...
Commit • DynamoRIO Projects • 14 hours ago
Arya Seghatoleslami

So we've been playing around with a bunch of stuff - maps API, users, UI and layouts - but this week we're focusing on the meaty content. Yes, that means the actual posts about free food events and the feed that shows them all. We expect to finish this and be able to have our first presentation by this Friday! Woohoo!

Post • YumYum • 14 hours ago
Hayley Schluter
2 files changed, 33 lines added, 14 lines removed

Next up is Account Preferences

Commit • FireDB • 14 hours ago
Samuel Yuan
6 files changed, 93 lines added, 78 lines removed
Commit • RPI Clubs and Activities • 15 hours ago
16 files changed, 157 lines added, 98 lines removed
joncrall
Commit • IBEIS • 15 hours ago
Cyril George
16 files changed, 134 lines added, 8 lines removed
Commit • Plan of Study • 17 hours ago
Chandler Dunn

I have been working on the homepage HTML code, CSS/Bootstrap styling, and jQuery functionality for the buttons. In addition to the upvote/downvote buttons that were in place before, I've added a stats button (view poll results and graph of responses), an expand button (most likely will open post up in new tab, allowing for viewing of expanded results, actual voting form, and comments), favorite button (not finalized, may change to something else) and a share button (not final either, probably will just copy the URL for the post's page into clipboard for now to avoid needing different social media's APIs). The next step is to work on coordinating the front end elements with the back end parts that Spencer has been working on. I will also be working on the "new post" form and the comments form. EDIT: I also designed a killer logo

Post • AskPI • 18 hours ago
Joshua Makinen
2 files changed, 0 lines added, 59 lines removed
Commit • MeNext • 19 hours ago
Joshua Makinen
0 files changed, 0 lines added, 0 lines removed
Commit • MeNext • 19 hours ago
Samuel Yuan
8 files changed, 68 lines added, 13 lines removed

Credit goes to the person who wrote the code

Commit • RPI Clubs and Activities • 19 hours ago
Samuel Yuan
10 files changed, 32 lines added, 132 lines removed
Commit • RPI Clubs and Activities • 20 hours ago
12 files changed, 294 lines added, 204 lines removed
joncrall
Commit • IBEIS • 20 hours ago
Robert Rouhani
8 files changed, 23 lines added, 10 lines removed

Fixes one of the issues in GitHub issue #23

Commit • SharpNav • 22 hours ago
Aaron Gunderson
2 files changed, 1 line added, 1 line removed
Commit • Whiteboard • 22 hours ago
4 files changed, 63 lines added, 4 lines removed

Justin, please make these a nice color

makinj
Commit • MeNext • 23 hours ago
Severin Ibarluzea

I took a break from working on git-collab this week to work on making the rcos attendance server open-source.

The RCOS attendance server has been used for two sessions now and seems to be working well. The server leverages twilio messages, cherrypy, sqlite3 and google documents to allow students to log their attendance via text.

Check out the repo! https://github.com/seveibar/rcos-attendance

Post • git-collab • 1 day ago
2 files changed, 1 line added, 0 lines removed
joncrall
Commit • IBEIS • 1 day ago
6 files changed, 46 lines added, 18 lines removed
joncrall
Commit • IBEIS • 1 day ago
Nathan Bernard

After reading up on Django and familiarizing myself with Whiteboard's code, I made my first bugfix commits! It feels great moving from learning the code to doing something about it.

Post • Whiteboard • 1 day ago
2 files changed, 4 lines added, 4 lines removed
kmcnellis
Commit • Homework Server • 1 day ago
2 files changed, 2 lines added, 0 lines removed
kmcnellis
Commit • Homework Server • 1 day ago
Nathan Bernard
2 files changed, 0 lines added, 18 lines removed
Commit • Whiteboard • 1 day ago
2 files changed, 4 lines added, 0 lines removed
kmcnellis
Commit • Homework Server • 1 day ago
2 files changed, 2 lines added, 2 lines removed
kmcnellis
Commit • Homework Server • 1 day ago
Spencer Norris

Bad news first, we lost Mr. Chris Valmas, leaving three of us on the team: Bikram, Chandler and I. Best of luck to Chris, you'll be missed. Now for the regular business. Most of my time so far has been taken up learning the languages and tools necessary to make this work, plus mostly other obligations outside of RCOS. Fortunately though, I'm beginning to pick up some steam. Over the past couple weeks, I've been doing my research on jQuery, Ajax, and MongoDB. Depending on some further design decisions that will have to be made, Node.js may or may not be used; either way, I'm laying this out with the intention of using a full Javascript stack, both for ease of design and for my own amusement.

Post • AskPI • 1 day ago
Spencer Norris

Bad news first, we lost Mr. Chris Valmas, leaving three of us on the team: Bikram, Chandler and I. Best of luck to Chris, you'll be missed. Now for the regular business. Most of my time so far has been taken up learning the languages and tools necessary to make this work, plus mostly other obligations outside of RCOS. Fortunately though, I'm beginning to pick up some steam. Over the past couple weeks, I've been doing my research on jQuery, Ajax, and MongoDB. Depending on some further design decisions that will have to be made, Node.js may or may not be used; either way, I'm laying this out with the intention of using a full Javascript stack, both for ease of design and for my own amusement.

Post • AskPI • 1 day ago
Spencer Norris

Bad news first, we lost Mr. Chris Valmas, leaving three of us on the team: Bikram, Chandler and I. Best of luck to Chris, you'll be missed. Now for the regular business. Most of my time so far has been taken up learning the languages and tools necessary to make this work, plus mostly other obligations outside of RCOS. Fortunately though, I'm beginning to pick up some steam. Over the past couple weeks, I've been doing my research on jQuery, Ajax, and MongoDB. Depending on some further design decisions that will have to be made, Node.js may or may not be used; either way, I'm laying this out with the intention of using a full Javascript stack, both for ease of design and for my own amusement.

Post • AskPI • 1 day ago
Evan Thompson
6 files changed, 127 lines added, 44 lines removed
Commit • Spoiler • 1 day ago
Brian Kelley
1083 files changed, 33 lines added, 44781 lines removed

Deleted android version on this branch

Commit • Where R U? • 1 day ago
Brian Kelley
316 files changed, 0 lines added, 16634 lines removed
Commit • Where R U? • 1 day ago
Samuel Yuan
6 files changed, 80 lines added, 59 lines removed
18 files changed, 275 lines added, 0 lines removed
vgamekid3785
Commit • SpokenMedia • 2 days ago
Jacob Abramson

Managed to get a prototype Dining Hall Menu off the ground and running on a separate project from RPI Mobile (basically a dummy app just to test this functionality).

The prototype currently supports all of the dining halls available on Sodexo's website and displays them one by one in a ListView. After clicking one of the dining halls, all of the menu items are then displayed in another ListView that correspond to the dining hall that was clicked. Menu item information is included in this list, such as day of the week the menu item is being served on, what meal it's being served on (breakfast, lunch, dinner, etc.), and which station (such as Grill, Pacifica, etc.)

The prototype grabs all this information by a JSON file online containing all relevant information pertaining to Sodexo's dining hall menu. This JSON file was generated by the Sodexo Menu Parser (before it broke, it'll be fixed soon though) that Daniel Baek and I wrote last semester.

The next task for me will be integrating this feature into RPI Mobile, and then making it much more intuitive and easy to use.

Regards, Jacob Abramson

Aaron Gunderson
80 files changed, 1676 lines added, 226 lines removed

Develop

Commit • Whiteboard • 2 days ago
6 files changed, 23 lines added, 52 lines removed
makinj
Commit • MeNext • 2 days ago
Aaron Cheng
12 files changed, 85 lines added, 8 lines removed

Conflicts: clubpage/clubpage.php css/main.css

Aaron Cheng
4 files changed, 142 lines added, 25 lines removed

New look and design.

Amartya Chakraborty

In our most recent work on rClubs, we worked on allowing the user to add clubs to their "MyClubs" list. We also focused on fixing some bugs that pertained to the users "MyClubs" list. We also changed the overall appearance of the club page, fixed up some links which were not working properly. Also, we focused on having each of the clubpages having an add and delete button and for a notification system where the user can receive important notifications for the club. Lastly, we also worked on redirecting the user to a different page. These are our updates for this week.

Evan Thompson
8 files changed, 45 lines added, 18 lines removed

Added buttons for Speed Monitor

Commit • Spoiler • 2 days ago
Samuel Yuan
6 files changed, 10 lines added, 4 lines removed
8 files changed, 182 lines added, 145 lines removed

Adjusts routines in instr.c and elsewhere to build for ARM. Tweaks the DR_REG_ enum for ARM to remove some of the X64 ifdefs to make the code simpler.

git-svn-id: http://dynamorio.googlecode.com/svn/trunk@2880 49cc7528-f6fd-11dd-9d1a-b59b2e1864b6

derek.bruening <derek.bruening@49cc7528-f6fd-11dd-9d1a-b59b2e...
Commit • DynamoRIO Projects • 2 days ago
54 files changed, 2764 lines added, 352 lines removed
lmoynihan
Commit • LED Color Control • 3 days ago
2 files changed, 0 lines added, 7 lines removed
makinj
Commit • MeNext • 3 days ago
2 files changed, 0 lines added, 17 lines removed
makinj
Commit • MeNext • 3 days ago
16 files changed, 179 lines added, 47 lines removed
makinj
Commit • MeNext • 3 days ago
6 files changed, 27 lines added, 10 lines removed
PeterRyder1
Commit • Check up • 3 days ago
Eric Oswald

I just finished migrating Google Charts to D3js just in time for the demo at the CS open house tomorrow. I'm going to try to get a bunch of sensors working with an Arduino. and visualize the data in a bunch of different ways to show off the project's potential. In the mean time, I have also been working on getting I2C working on the PSoC 4's. It's giving me a lot of difficulties but I haven't been spending too much time on it so I'll see what I can do now that the dashboard is basically done.

24 files changed, 563 lines added, 116 lines removed

Widens reg_id_t to a ushort and solves complications from widening: 1) Requires that addressing registers be in the lower 256 and adds checks to opnd_create_far_base_disp_ex(). 2) Starts OPSZ_ from 0 for ARM, and asserts in arch_init() that x86 fits. 3) Update several other types that were using byte to use reg_id_t.

Adds ARM DR_REG_ enum values, reg_names[] array, and dr_reg_fixer[] array.

Decided not to model the middle-16-bit sub-register operands of OP_movk, at least for now, but we do have DR_REG_ constants for the top half, bottom half, and bottom byte of GPR's.

Decided not to bother with DR_REG_START_GPR, etc. for ARM, as the register numbering makes it pretty clear where the starts are.

git-svn-id: http://dynamorio.googlecode.com/svn/trunk@2879 49cc7528-f6fd-11dd-9d1a-b59b2e1864b6

derek.bruening <derek.bruening@49cc7528-f6fd-11dd-9d1a-b59b2e...
Commit • DynamoRIO Projects • 3 days ago
Eric Oswald
0 files changed, 0 lines added, 0 lines removed
Eric Oswald
10 files changed, 380 lines added, 443 lines removed
Eric Oswald
10 files changed, 380 lines added, 443 lines removed
18 files changed, 2 lines added, 51 lines removed
joncrall
Commit • IBEIS • 3 days ago
Hayley Schluter
18 files changed, 345 lines added, 5 lines removed
Commit • FireDB • 3 days ago
12 files changed, 153 lines added, 107 lines removed
chadunn13
Commit • AskPI • 3 days ago
2 files changed, 1 line added, 1 line removed

changed logo size and put logo on imgur

chadunn13
Commit • AskPI • 3 days ago
2 files changed, 1 line added, 1 line removed

added logo

chadunn13
Commit • AskPI • 3 days ago
4 files changed, 25 lines added, 14 lines removed

added tooltips and iterative post elements

chadunn13
Commit • AskPI • 3 days ago
4 files changed, 31 lines added, 26 lines removed
chadunn13
Commit • AskPI • 3 days ago
4 files changed, 97 lines added, 67 lines removed

redesign of page, implemented buttons (currently non-functional) and parts of post elements

chadunn13
Commit • AskPI • 3 days ago
Charles Machalow

Spotify integration has proven to be difficult. It works except it grabs information for the last song instead of current song. As a stop-gap, I've added audio control buttons (Vol +, Vol -, Mute). The Spotify integration works amazing except for it being the last song each time...

I'm so close that I can almost taste it.

Post • cDashboard • 3 days ago
Jacob Lowey
4 files changed, 679 lines added, 0 lines removed
Commit • SpokenMedia • 3 days ago
John Behnke

Quick update. I've been pinned over the last 2 weeks with multiple tests and midterms along with some pretty lengthy homework assignments (I'm looking at you, CompOrg). Because of this, I haven't been able to work on Where R U? for more than a couple minutes here and there.

My main goal I've been trying to achieve is the set up of the "Rides" tab, which will allow for the creation of Ride objects. I started with implementing a "Rides" class, complete with some temp inits and member variables just for testing purposes. The next step would be to implement the table view in the rides tab (Like how iOS mail app looks). In order to do this, I have to be able to actually test the implementation through the iOS simulator or my actual iPhone, and this is where problems have begun to show their heads. I have to implement auto-sizing for the table view's UI elements so that they show up correct on any screen size. This is seeming to be easier said than done, as I've tried multiple times and failed.

Thankfully, I remembered I had a tutorial series I got over the summer that has a section on this very issue. Hopefully I can get it sorted out this weekend.

-John

Post • Where R U? • 3 days ago
8 files changed, 354 lines added, 10 lines removed
joncrall
Commit • IBEIS • 3 days ago
4 files changed, 143 lines added, 0 lines removed

Add stub files to get drdecode building on ARM.

git-svn-id: http://dynamorio.googlecode.com/svn/trunk@2877 49cc7528-f6fd-11dd-9d1a-b59b2e1864b6

derek.bruening <derek.bruening@49cc7528-f6fd-11dd-9d1a-b59b2e...
Commit • DynamoRIO Projects • 3 days ago
Samuel Yuan
2 files changed, 30 lines added, 1 line removed
Hayley Schluter
2 files changed, 12 lines added, 4 lines removed
Commit • FireDB • 3 days ago
2 files changed, 222 lines added, 0 lines removed

wiki

Jacquelinehy520
Commit • Sheng Guan Tu • 3 days ago
Sebastian Sarbora

Just a quick update, our revised motor controller boards have been sent to the fab and should be back in about a week. Then we can just hook them up and actually get this thing moving!

Post • Neptune • 3 days ago
Kienan Knight-Boehm
6 files changed, 100 lines added, 208 lines removed
Commit • SelfSecured • 3 days ago

Yosemite’s out! I’ve just completed installing it, and haven’t put Docktor on my install yet, but I tested all of the commands that Docktor depends on and they all work! Also, KillAll is notably faster when killing the Dock, so that should result in a pretty awesome and well needed speed boost. Will post an update this weekend regarding Docktor’s comparability, as well as finish moving to the new Git repo! The post It’s Happening!!!!1!1!1!!! (Obligatory Yosemite Up...

Theo
Post • Docktor (For OSX) • 4 days ago
Kienan Knight-Boehm
12 files changed, 484 lines added, 216 lines removed
Commit • SelfSecured • 4 days ago
8 files changed, 22 lines added, 4 lines removed

Mostly adds ifdefs for x86-specific stuff still in core/arch/ to get drdecode building under ARM

git-svn-id: http://dynamorio.googlecode.com/svn/trunk@2876 49cc7528-f6fd-11dd-9d1a-b59b2e1864b6

derek.bruening <derek.bruening@49cc7528-f6fd-11dd-9d1a-b59b2e...
Commit • DynamoRIO Projects • 4 days ago
6 files changed, 1195 lines added, 18 lines removed

Adds the initial A32 decoding table, for predicated instrs only for now.

Uses a separate file per decoding table (so Thumb and A64 will have their own separate files).

To reduce the number of extra operand entries, uses the flags DECODE_4_SRCS and DECODE_3_DSTS to fully utilize all 5 operands for any combination of srcs and sts.

git-svn-id: http://dynamorio.googlecode.com/svn/trunk@2875 49cc7528-f6fd-11dd-9d1a-b59b2e1864b6

derek.bruening <derek.bruening@49cc7528-f6fd-11dd-9d1a-b59b2e...
Commit • DynamoRIO Projects • 4 days ago
6 files changed, 714 lines added, 0 lines removed
  • Add decode table entry flags, extensions, tables, and types for ARM A32 predicated instrs
  • Add some types we'll need for Thumb and A64 as well
  • Add initial A32 decoder algorithm for predicated instrs

The actual tables, and operand decoding, will come in separately.

git-svn-id: http://dynamorio.googlecode.com/svn/trunk@2874 49cc7528-f6fd-11dd-9d1a-b59b2e1864b6

derek.bruening <derek.bruening@49cc7528-f6fd-11dd-9d1a-b59b2e...
Commit • DynamoRIO Projects • 4 days ago
6 files changed, 339 lines added, 42 lines removed
  • Add condition code constants for ARM
  • Add PRED_ constants for ARM condition codes for predication
  • Add OP_ opcode constants for ARM A32 predicated instrs
  • Add OPSZ_ constants for ARM A32 predicated instrs

git-svn-id: http://dynamorio.googlecode.com/svn/trunk@2873 49cc7528-f6fd-11dd-9d1a-b59b2e1864b6

derek.bruening <derek.bruening@49cc7528-f6fd-11dd-9d1a-b59b2e...
Commit • DynamoRIO Projects • 4 days ago
4 files changed, 39 lines added, 0 lines removed
  • Define X86 for clients just like we define X64 today
  • Keep ARM and X86 in doxygen headers
  • Add IF_ARM and IF_X86 and related defines

git-svn-id: http://dynamorio.googlecode.com/svn/trunk@2872 49cc7528-f6fd-11dd-9d1a-b59b2e1864b6

derek.bruening <derek.bruening@49cc7528-f6fd-11dd-9d1a-b59b2e...
Commit • DynamoRIO Projects • 4 days ago
2 files changed, 196 lines added, 0 lines removed

git-svn-id: http://dynamorio.googlecode.com/svn/trunk@2871 49cc7528-f6fd-11dd-9d1a-b59b2e1864b6

derek.bruening <derek.bruening@49cc7528-f6fd-11dd-9d1a-b59b2e...
Commit • DynamoRIO Projects • 4 days ago
18 files changed, 419 lines added, 309 lines removed
Spencer
Commit • SelfSecured • 4 days ago
Peter Piech

The title pretty much sums it up. After reviewing the pull request from Taoran "Tom" Li, it was merged earlier today into the development branch. I also updated the Google Play Services Library to the latest revision available and added some git files to make life easier.

The next phase of development is to implement the dynamic weather images and integrate RPI directory into the app.

Branden Clark

The conflict that has been blocking us from testing on Windows has been fixed.

Now we can run the test-suite on Windows and get our patches committed!

Fix: r2870

8 files changed, 51 lines added, 28 lines removed

Fixes issue 1547

git-svn-id: http://dynamorio.googlecode.com/svn/trunk@2870 49cc7528-f6fd-11dd-9d1a-b59b2e1864b6

brandenjclark <brandenjclark@49cc7528-f6fd-11dd-9d1a-b59b2e18...
Commit • DynamoRIO Projects • 4 days ago
Chandler Dunn

I have been working on the structure of the homepage, iterative elements in HTML/jQuery (ie the posts that will show up on the homepage), and generally working to get some functionality to the site. It has proved challenging, given that this is the first big project I've done with HTML and jQuery, but it has been enjoyable learning to program with these languages.

Post • AskPI • 4 days ago
Chandler Dunn

I have been working on the structure of the homepage, iterative elements in HTML/jQuery (ie the posts that will show up on the homepage), and generally working to get some functionality to the site. It has proved challenging, given that this is the first big project I've done with HTML and jQuery, but it has been enjoyable learning to program with these languages.

Post • AskPI • 4 days ago
4 files changed, 85 lines added, 20 lines removed

Major problem in name table

joncrall
Commit • IBEIS • 4 days ago
Samuel Yuan
4 files changed, 42 lines added, 13 lines removed