lots of changes for the good
making hella chagnes