Small desgin changes