modified till last working app