Updated for beamer-presentaion