cleaned for the real code