Updated this to be more applicable to real use