FIXED: some design related fixes