massive upgrade and changes all around