Revamp and Update complete!