Organized; new vars, aliases