merging newest tropic with mine