Working On Some Updates