Rehaul

for new update, added stuff too