Updated desing