Made the last few things work