UPdated some day 2 stuff