moving towards a better workflow