minor update, about to merge back to develop branch