Changed default X to 16, added Vorici calculations but not implemented currently