Made more flexible