changes to handle handles ;)