Major adjustements. *salute*