added more handle stuff