This is an update to fix some basic problems