added handler and additional update functions