Updated stuff I need to do