moved some stuff over from original config