Preparing code to merge with main_tmaze

.