some major updates lol