been testing these out, made a few changes