Streamlined some of the creation