integrated my stuff, now working