linking + better workflow