Updated from feedback version2