some stuff happened after i came back from drinking. code changed