Fixed Amy & Template Updated