2014.11.03 - adjust base structure