removed really old function causing problems