Updated from feedback