Hopefully fixed the follies i did before