Add in some clever bits