Version 2 based on feedback received