merge shit
just merged
adjusting obj reading
stupid merging