Made more abstract
Made more abstract