3 and 4 issues

final changes