edited some shiz in shift