Adds and improvements