Began modifying for usage