Updated Mock Up