Update the way this is built