changed a few things to use less storage