Added changes to merged project ryan_dev2