Merging our changes, added a few commands