version 7
version 7 - merged