edited with current changes