tried moving some stuff around to get things working