revamping whatever this is

Modified