Changed some spaghetti.