Change some stuff around #2