Shuffeled more code around