Some desgin changes