- updating for 1.6 structure