updated some obsolete functions meh bleh