Adeel 11/6/13 changes and updates