version 3
version 4
fixed bugs from merge