Udated overwritten Logic