Updated overall application processing; Updates also to #1