some trashy changes