master re-structured